Add to last fix: In gtk resizing count tool and menubars.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 4ecdd18aeb2ce1b9bc31745c6baff2fbb5b0dd06..ef422989c61a1df910860cea86ac86b5c0a34027 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -952,7 +952,9 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
   /* Must resize our top level widget.  Font size may have changed,
      but not rows/cols.  */
   gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                     pixelwidth, pixelheight);
+                     pixelwidth + FRAME_TOOLBAR_WIDTH (f),
+                    pixelheight + FRAME_TOOLBAR_HEIGHT (f)
+                    + FRAME_MENUBAR_HEIGHT (f));
   x_wm_set_size_hint (f, 0, 0);
 
   SET_FRAME_GARBAGED (f);